Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: b715f9f880

Change-Id: Iab98dc3920b7de1676ed57d7bc5c911a8e7cb8f3
tree: 4b92f07c4dc76f1feddb9c162f2d89436682f476
  1. LoopbackApp/