updates from aospa-legacy

Change-Id: I0d799152d97d5b795b0d6d0a2cc0c3aad3d79909
Merge branch 'kitkat' of https://github.com/cj360/manifest into kitkat