Bug: 150158890 Test: build & inspect platform_tests.zip Change-Id: I06c0acd0f7fed168e8e2ad876a58983b11d9b43f