Android n mr1 preview 1
Merge "Move atrace init into on fs trigger"