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

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

Change-Id: Ic49ec54b9d99322c052ed7c2ffec9ef0e84867b5