Merge "Make bootstat container-friendly"
am: 0eee579fa2

Change-Id: Iee8145ade4ae97af3d5738ecfad7c3121b7e3c56