Merge "Bump target-level to 3." am: f5b4982cad am: 8a1331e728

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1467926

Change-Id: I3e9c71a1a784c190cf1c753ff41d3103644fa3f3