updated to aosp-plus build repo and kernel

Change-Id: I83e3e4260d82ee0e2c694151d465999e279d3a91