Bug: 117474929 Test: Build L3 from unbundled branch Change-Id: I67833e5c852faa17f036f2a2dfb29521c08d0641