Merge "Allow the use of a custom Android DT directory" am: 6fa0884188 am: 8b2e0e03d4 am: 8bdf7ed10e am: 5e8de93697
am: 01128555ac

Change-Id: I8846582a1d7ec8eb116b5157d717b9dcd7bf32ff