Merge QP1A.190122.001

Change-Id: I1f4ee58393344c0c715c283b9db448d429c4934f
tree: 0b8683ab5a13b8e34d8206fa3afc8b48287acbea
  1. bootctrl/
  2. libhwcomposer/