Merge "Install runtime resource overlay without subdir." into cw-f-dev
am: 84973f87e6

Change-Id: I8759edae3cda8fdb81a541126fe52b3beb19355f