This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: If23512c9e4a70462d70ff965e59339a33541746c
Change-Id: Ic12a045dda47ccd270c8c3e9e83768e04a53ad58
(second attempt due to conflicts). Change-Id: I2143921bcacdbaa6cfcaf59602713294b4b1f6ee