Merge "Update script to match upstream structure"
am: 34c934f7dd

Change-Id: Ice51f32b7bf1111d9f039f4ba0f0b81b1e40da64