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

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

Change-Id: I506b00368156c35d019c5aa86a173232cd128009