Merge "Add NDK plugin to ADT package feature" into idea133