Merge "Remove reference to non-existent resources directory" am: 8647200f8a am: 8a82a62902 am: b7accc584c
am: 0ae269e414

Change-Id: Ib82124e2d37b65b0dc4bdf75495f10ca712ef957